rerun with minor fixes