Minor fixes, still working on the annotation function.
Some minor changes to the annotation function.
Beep
Minor changes
Merge remote-tracking branch 'origin/master'
Fixed the annoying annotation problem
Fixed the annoying annotation problem