fixed bugs :)