Throughout the entirety of my writing experience, I have never clearly understood where the comma or question mark are supposed to go in relation to quotation marks. :v
Comma shouldn't be an issue, question mark, like full stops etc, go outside if the end of the quote is the end of the sentence, and inside if the sentence continues after the quote.