Reformatted markers, added structured data to markers, cosmetic changes to header