Map and raycast fixed