misc cleanup & making sure todo hook is working again