Dan and Chris fixed bugs and links