More links, and fix deep urls