Tighten up routing and help a little