Bugfixes and additional city information