cleared some bugs