Andy's changes

Andy has done a bunch of stuff not included in your repository.