Minor Changes
Reorganizing, setting some useful options