reduce penalty delay and increments, they are being too harsh
Merge branch 'master' into portable