Fixed some maps
Improved the folding