Some more final changes, getting ready for submission