a few more improvements :)