Some minor tweaks
ready to go