Various fixes in numbering and code to VanillaJS
Merging steps
Merging other steps