1. Yes, sorry. In the process of fixing those as the licenses are finalized.

2. That's a good idea, but I can't do that in the actual license documents since I need to keep the actual licenses clean from non-license materials. Do you have any good ideas how to do that?