Pull request for more changes

All sorts of useful things