Baldur/route bugs

this covers fixing gaps in routing and other cleanup