fixed them bugs :)