Operator clean up

fixed errors that appeared when operator implemented