Added note to dumb self as comment. :)
Fixed TODOs.