some tweaks from last minute hacking