minor changes... (picking up the project from a long stand-still)

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