Slightly reoder startup steps, and enhance logging