more "contains" fixes (oops) and some docstring updates