More tidying and fixing.