tidy up
various untracked changes