Fixed small bug in NPPLUR; begun generative code