several minor bugs squashed...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
several minor bugs squashed + updated todo...

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

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