Change penalty from squared to cubed
Small fixes