tweaks & corrections