Several changes

Several changes