Misc changes requested by Matthew