Fixes indentation and minor bugs.
Fixes indentation and minor bugs.

eisop/annotation-tools,typetools/annotation-tools,eisop/annotation-tools,typetools/annotation-tools,eisop/annotation-tools,typetools/annotation-tools