numerous minor fixes.
minor fixes.