Documentation, renames, fixes for Holger's comments, etc