some bugs to fix