Removed Some Bugs.