fixed, finished, restructured and cleaned up config stuff