tweaks and recovery from botch

Signed-off-by: Fred Shequine <fshequin@gmail.com>