Fix numerous stuff
Remove old example of map file