Edvin Dunaway minor tweaks