fixed roll.up and points calc