Mostly final changes pre-submission