cleaned up logging and fixed the pile of stuff I broke in 484f6613f6781b34ece623c89546fd4e48d31f75. Can't be bothered to write down the tickets this refs.