Remove submit! and fix bugs with the current submit function