More good changes

At least I think so...