fix toplevel termination
Auto-indentation with ocp-indent
Using editor tag support for indentation instead of spaces, much neater result