added core_stuff and cleaned up cities