More changes and stuff
fixes, maybe.