Annotations

Added separate annotations for cbg vs smbg. Merged with latest master. Ready for review.
Hmm, I was sure that was it! I'll leave it for post-merge, it's certainly not a huge thing, more of a pixel-perfect thing.