added make return code testing, fixed gcc c++ prob (i hope)