-*-snlp-*- speed impr & bug fix