Before changin 1_d parts
Finish more 1d-mapping theorems
Fix small typo