fixed zever bugs