fixed DB crap, commented out map stuff.