@Tod ********
I came back visa exempt 30 days as I'm applying for the Non O for marriage, I got tomorrow for that actually. So no, didn't go to the Thai consulate there just in and out, I have been and got visa from the Thai consulate there in the past and was pretty straight forward, I have a friend there now actually applying for her Non B
And yes, Thai pass I did before I left Thailand