Cleanups, minor fixes and improved output during startup.