split into operators file; various minor changes