Mechanics improvement

Mechanics improved slightly. Coloring and scoring updated too.