Weekend pull request

Weekend work (see commits)