total points and some fixes