added c++11 override keyword to more classes