David's corrections addressed in bareconf and into
Resolving merge issue schite