various cosmetic changes and non-c++11-compliancy fixes