Fixed some minor bugs :P