misc corrections
misc corrections