minor changes
fixed isZ, isW variables