wip -various cleanups