Final batch of fixes. Diagrams should work, fuch them if they do not. extracted wymagania to outside document.