Cosmetic changes and some minor fixes
re: previous commit