Misc changes. Using c++11 standards for the moment.