Fixed all punishment punctions