improve markup and add some microdata