add city model and basic specs; clean up raw country data