tweaks to model nulls etc