added point system and cleaned up some