Zone and unit consistency, add definitions, general cleanup of data spec.