cleaned up some wrong routing and links