Fixing lots and lots of bugs