Several Multi-Z Fixes
Fix.
Merge pull request #244 from jamiedigweed/Multi-Z-WIP

Multi z wip