slightly more improvements