Heptagons: add fold w.6 position and use map
Heptagons: add fold w.2 position and use map

Signed-off-by: Marcel Tunnissen <marcelteun@gmail.com>
Heptagons: add fold w.5 position and fix comments