more tweaks, final commit of the night