solved some bugs
solved some bugs