tweaks and cleanups