Fixed oneByOne(), added oneLayerOneByOne()

I have now fixed the oneByOne() method, and I have added an
oneLayerOneByOne() method.