* A metric crapton of additions

* Partially-adapted paint program for annotating map