even more improvements