Compile both dhp-pi and dhp-en into a single html file, also fixing various problems with dhp-pi