updated todo and safety notes