un-hardcoded step names
typos, rare bugs
Formatting updates