Miscellaneous improvements

Signed-off-by: Herb Bowie <hbowie@mac.com>