Added a few more bugs, removed many bugs