more improvements :)