backup
refactoring clone
Merge branch 'master' into clone
Java tests pass again.
backup
some fixes
refactoring clone
added some classes for operator. not yet used though