Tidy-up, add more microformats 2