Misc bug / feature changes (#227 #228 #210)

[TheRealRyGuy]

Fully fixes #227, should but untested fix #228, begin to fix #210 All are untested!!!

[jagrosh]

Please make these as separate pull requests (one pull request per issue), it's difficult to review these.