initial commit with minor tweaks