Final Solution updates

Commenting in progress.