updated todo...

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

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
updated data format to 2.1,  some refactoring and minor optimizations...

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