More changes, lots to fix still