added more scoring
code cleanup + inline todo