Deleted some bugs