some more improvements :sparkle: