a couple of improvements is implemented