Further work on Market

+ fix (hopefuly) weird crash when throwing poop