changed options to disable extra features
Fixed merge conflicts