fixed some stuff in zas