new functions (rip) and some changes
Merge remote-tracking branch 'upstream/master'
making annotations work again