minor
some stuff from cwr