Fixed some bugs
Updated maps too