Add maps
Update gems
Failsafe author_sort
Fix placing of annotations
Tidy up maps