Many, many bug fixes, and removed the fake annotation widget, replacing it with an XPointer tool.