continued updating. added todo list. update not finished.