NBF0: bug fixing & tweaks

meh