Added market + small fixes