[minor] wnf refactor, fixes in demo