Justification and doc improvements.