yet more improvements