safe but stupid - check both int and string for stand id
deployment tweaks
Merge remote-tracking branch 'origin/master'