z, big yus, + some minor changes