Fixed many whitespace issues
Moved OLAD start/stop handlers to appropriate places