minor final fixes