Nil pointer errors, links within iframes preserve iframe params
Merge with Ozzy's latest