Updated todo's.
Minor code improvements.