* Miscellaneous fixes by iryston. Minor indentation fixes.