Annotations

Added separate annotations for cbg vs smbg. Merged with latest master. Ready for review.
Let's change this to 'How is this statistic calculated?'