Add more debug output, change city saving method
Merge done