fixes and addition of lnnqc