removing this from our private branch
very small cosmetic changes that affect the console output
some fixes.