Add a few more changes, pretty much done with emerge for now