Further tidying of remaining user docs