Generalizing Files and Other Misc. Fixes