more markets, bugfixing