cleanups and tweaks