Dev

Hi, 

Just a few small tweaks that I'd thought others would find useful
Regards

Paul