Removed some bugs and added new ones.