initial corrections from jad