Add areas as a type of annotation.
Fix a bunch of bugs