Made many of the changes suggested in the curator jam.