Fixed many of the bugs in my last push