fixed an odd bug (attempt II)...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
updated todo and some cleaning...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>