remove annotation
More operations and minor fixes