Added a few more goodies.