cosmetic issues fixed