trying to remove old way for config
misc reorganization changes
minor
more clean up
minor
misc
Some fixes and change in presentation