A few more minor bugs + update index.html