Remaking of some partes

https://map.bnnd.eu.org/user/Ciprian/diary/592