Remove some bugs and add new ones