minor changes. just committing so I can work on a clean tree elsewhere