switchToAsset working, some other cleanup on AnnotationEditor methods