More changes

too lazy for description