Preparing engine.
Fixed some merge conflicts.