added a couple of interesting tweaks