edited small things in final-step