Merged Johns suggestions with other updates

Signed-off-by: Marty Burns <marty@hypertek.us>