Consolidated finish/mark_finished methods (ChangeSet) + more comments