added a few minor tweaks