many fixes and much progress on the market screen