minor tweaks added