Embetterments

I'm not finished with embetterments, however these can already be reviewed and even merged, I guess.