more checks added, minor fix in index.html