Tented vias

Cleaned up routes more