Fix and Finish