fixed file paths and no longer call makeBuffer too much