Annotations

Added separate annotations for cbg vs smbg. Merged with latest master. Ready for review.
Hm this doesn't seem to fix that issue. That problem exists in master so I don't think the stats stuff is what broke it.