multiple corrections from Heikki's suggestions, renaming of html file id's