cleanup a few more props, and added allowExtra flag