small tweaks to generate correct html