Made map 2D array and fixed mouse

Might cause merge error but shouldnt