Submissions working + fix up single file mode