Fixed some bugs :P