New ZAS Bugfixes

Not even a day into dev and it already has bugs.