Further developments; many improvements