some udates and changes