fix submissions properly, closes #76