Removed some bugs.