Various updates. Add Helper