more tags and better html output