Fixing lots of bugs!