Fix tons of bugs, general polish, push 0.9.7

It's here, it's here, it's finally here!