finish! fix and simplify finish_one!