some more improvements