Lots of markup tweaking and adding locations and events