to Tingnan: two answers to your questions

(the rest is ChasoBookery cosmetics that you can safely ignore; best not
to diff the files, too many cosmetic changes, none need to be checked)