typesetting/indentation fixes, etc