Also includes a few minor changes suggested by Christoph
Signed-off-by: NSteve French <sfrench@us.ibm.com>