Add some actual zone display values, fix a bunch of warnings.