Added a couple of improvements.