Fixed bugs :D