PUSH: 081520221206 HSHA-207 & 191 Fixes during scoring for ghosts and amenity points

Continuous Integration
#1

Upgraded amenities were not pointing properly. Ghosts were still deducting from the wrong player when scoring (previously though fixed, now fixed and extra tested).