Removed Some Bugs