various corrections for rework