Some mods suggested by David Rusk

Signed-off-by: Raymond Rusk <Rusk.Raymond@gmail.com>