Add some todo comments
Add todo comments, and a little tidying.