last minute tweaks
more minor tweaks