Tune-ups

Almost ready for prime time

Signed-off-by: Bill Waggoner <ctgreybeard@gmail.com>