More work on projects. Some more tidying up.