Template fixes, lots of links still broken though.