More changes

Giving up for today... Grrr