some changes, starting to get used to the c++ naming conventions :)