Fixed bugs found in testing.

Blame the bugs on me being a Freetard. :guitar: