[++] zaw; cleanups