retest, mostly stuff for manual.  tidyup a few details