tons o' changes, primarily submission stuff