Various fixes

Just finishing up my stories on Pivotal. Each commit corresponds to 1 story I think.

Mostly minor fixes. Should be a quick review @MrMaksimize :smile: