Logging back into the pi in headless mode, plus fixes elsewhere