Various changes including:  better organization of configuration options,improved auto-reauthentication (when enabled), general simplification and cleanup.
Various changes including:  better organization of configuration options,improved auto-reauthentication (when enabled), general simplification and cleanup.

DavidRueter/Theas,DavidRueter/Theas