minor bug fixes
cosmetic changes