market and some fixes