Some cleanup and syncing from FMap
Finish WRaw2Maps (and synchronize the various modules a bit)