Minor fixes, editing, code cleanup.