added anti-overlap and fixed scoring system