new annotations and reviews
last review before full rewritting
large review & reorganization