esnz minor improvements