minor tweaks from a while ago