Added in the treat null as now checkbox handling and tidied old comments out