Submissions

Updates to Submissions to fix #120 #139 and #170