Further evolution

and bug fixes