make MOP fit for annotation-based analyses
bit cleanup