Finishing NS, adding a few strays