some cleanup and testing of new code...

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

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