cosmetic and code fixes due to latest updates