CONFIG changed to plain c++11
minor updates