1.13.8.2

(1) Several files have been consolidated, with some minor bug fixes
(mostly in the form of variables, placement of code, and the like).