Adds docking weather responsive & minor clean-up