Updating stuff

So that we can finally merge everything that should be merged.