final tugs & tweaks