! its null not nul and wrong variable use

Signed-off-by: Spuds <spuds@spudsdesign.com>
! from wrapper order of choice tweak for From:

Signed-off-by: Spuds <spuds@spudsdesign.com>
! This is really not useful not to mention it does not work as expected

Signed-off-by: Spuds <spuds@spudsdesign.com>
Merge pull request #1732 from Spuds/fii

BB error from log, plus mistake in previous mail commit