Consolidate things, and start allowing auto processing to be turned off. See #319