few more improvements