further visual changes and cleanups