World fixes and city work