added a draft plus minor tweaks