Revert "Change PunishmentForm and other fails."

This reverts commit fe0b6671b70dd23d9f6dc2367af2c1adba311045.
Revert "Revert "Change PunishmentForm and other fails.""

This reverts commit 11e152251ebe34e6af58bf4bb885fad18d6c495f.
return to Javi Branch