File path fixes; output cleanup