Also fixing some c++ errors within commented off code as the localization engine was getting confused by it.