cleanup includes; rename global config obj; misc fixes