bringing everything up to date
Accepted all Tim's revisions