Added some features that I (@dpp) would like

I've added a few features that would make things easier/better for @ProjectPlugh