more mapping and hair pulling

https://map.bnnd.eu.org/user/Circeus/diary/7171