remove helpstr
better types
LNR tweaks
move LNR
use new names