added a few more tweaks