just a few more tweaks