multiple tweaks & general cleanup