Fixes
Many fixes to Zat
Zat Almost Fully Working