More logging, reorg somethings