Made more fixes... Got rid of some warnings/errors in mapdriver.c, it needs more fixing