Several changes on everything