Removed some bugs and old code.