Bugfixes and Index HTML Changes