Fixed all the bugs that Dumpdavidson mentioned.