more tweeks, still dancing, but now there is hope...

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