Fixed editor anno handler and some cleanups.