More Todo & Minor Fixes