misc changes

Did a whole lot, and didn't commit :/