updated TODO
abstracted caption borders
abstracted quasi-paragraph borders
Merge branch 'hotfix' into typo
added message tags
Merge branch 'typo' into edu
updated no calculator labels