fix some irregularities