Added a couple of useful features.