fixes for PR
Merge branch 'placingbid' into location