and more improvements