didn't really fix anything, but there's a bunch of commented out code that should maybe work someday