fix a bunch of market stuff and more