Amazing map, still a few mistakes.

Sub 3 is my new target.