Bunch more fixes. Lots of cleanup.