ZAS Cleanup/Tweaks