More docs and comments. ExtractAndComb tidied.