A few fixes and first commit of EditCity