Add default point system and small adjustment