Fix a few gold conditions that I missed, trade window was affected