Fixed bugs I made