More things
null fixes
blah