Minor changes
Several changes