corrected some defines