A few little fixes

Maybe it should also cater for gold > maxGoldinTile, or is it 100% sure that sure a situation cannot happen?