Fixed drawing map and collision

Got it to work, finally. I'll have to clean it up cause there's still a
lot of debugging stuff and commented code, but that should be trivial.