Loooonger table
All columns annotated
Fixed small errors
Merge branch 'feature/fix_annotated' into develop