Minor adjustments and additions

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