up to 8.2.1

- not tested
- cleanup of unneeded junk from spec