Changed off the horrible map, also added a few other things.

May have some errors still.