annotations now have callout button
merged with origin master