rework some bad sentencing