improvements and cosmetic changes