Various edits
More tweaking for BNodes