Added several options to the config file. Reorganized.