Some Bugs Removed