scorers + refactor + others