putting finishing touches on trails rewrite