Fixed some bugs :)