Fixes color array wrapping
Improved scoring
Merge branch 'develop'