Inconsistent bonus point system

Other GoodShort issues: