mostly g++ -Wall changes... mostly