Adding be None and contains

Also cleaning up a couple of things.