Scoring works + many other fixes/changes