started consolidating more config consts etc