random cleanup, tweak, adds