more penalty fixes