Tweaked almost everything. More C++11isms