adding some options into bootstrap to be able to redo it after initial install
fixed conflicts