Cleaned up some //FINISH comments that had been done.