Refactoring.

Cleaned up some arrays.

Also put more regions in