lots of fixes + penality manager