Thursday night puzzle fixes
Final James commit of Power Spots before pulling Petras changes.
merge commit