minor source clean-up and WIP annotations; vers. 4.00.130