Various changes
Some final pre-submission changes