Fixed many whitespace issues
Moved OLAD start/stop handlers to appropriate places
Merged new changes from branch issue/11