* update todos.
* Switch methods from protected to private.