Some final touchups for submission