Fixing lots of bugs.