changed some attributes
Several changes