generally made things better, prevented compilation on SunOS for the time being