a little more improvements