More checks, and fix error in index.html highlighted by checks