Apply changes from Huming Teo
Apply changes from the last couple of maintainers to the HTML build
Build out changes relating to typo fix