Re-arranged some vias

straightened a few things out