Fixed the Finish button
removed some commented out code