integrate LP and VKJ suggestions, almost finish review of all text