Total points only updated after save, added comments, simplified.