Fixing all of the bugs