minor tweaks, hopefully final