Small improvements

- Close fold
- Reword a comment a little bit
Minor fixes
Small marks mapping changes
'Exchange' plugin