Market scaling + Plaza speed
#351 and #350
Merge pull request #385 from jcotrel/master

[ch2] #351 and #350 + market scaling + plaza speed