final tweaks & cleanup