Added staff and student markers and tracking for how many people from each location