cleaned some bugs
cleaned some bugs