Add extras

Optional add-ons for an even deeper clean.