made a few more tweaks