got some bugs to fix