M City: bug fixes

bug fixes