Fix step ordering, finish pass through all content, still needs final review