Cleared some bugs