cleaned some bugs