Assorted improvements. Mainly completeness.