added templates for rest of steps, minor tweaks