started work on tagging...

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

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

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