various tweaks and cleanups