Some final cleaning up, had a few naming issues with NE, LETSTAR, and NIL.