added final review and some minor cleanup
updated todo