Please consider adding support for the \setcitestyle command for the natbib package. This command adjusts the way natbib produces citations (in particular the punctuation surrounding and within citations). This command is described in §2.9 of the natbib documentation.