Small bug fixes, fixed picking if no city was calculated