I have been trying to work my way through all of the developments, and I have to say, Aiwendil's changes are hard to track given the fundamental restructuring which comes from using a new base text. Could that new version with AAm as the base text be posted in the private forum for easier analysis? I don't have as much free time to restructure the text myself from scratch I'm afraid