Fixes + Changes

The structure and some wrong data have been changed.
The areas outside MA have been added.