lots of stuff works, fixing things up