last minute fixes and tweaks