More Updating and Tidying