Minor edits and bug fix to BND spider