Fixed bugs

I found some bugs after the initial push and fixed them