merge mods by Dimitris Papavasiliou
fix order CXXFLAGS
use standard drawstuff names/locations