Null fixes

Fixes #23, #24, #25 (and brings up to date with a few other improvements)