Final fixes and tweaks