bgreenwell minor tweaks