Dev

A number of check-ins, the pull request is as a result a little larger than I'd prefer, if you review my logs they are broken up on commits into parts, sorry about this, in the future I'll make them smaller.