bundle a few more things
some dedupe for the soul