5-in-1 Bugfix special. Limited time offer.
Merge pull request #862 from ike709/i_hate_git

Stolen Bugfixes... Attempt 2