cosmetic updates and additonal changes