updated TODO, brushed up on code and devnotes to prepare for reading