Multiple doc update.

Also some minor schema an processing changes.