Made the goal duration margin and scaling optional rosparameters