Fixed more problems with underscore files; I suck.