annotations + bugfix
one giant commit