a few changes to final