All of the changes from #53, #54, #55

[radl97]

Thanks for the help with this. However, I'll close this for now, as #55 and #54 won't be merged as is.