And multiple as well... If you don't have a re-entry permit & leave Thailand, you won't be able to enter on the old Non-B visa and have to start all over again...
You can get a Non-O based on marriage from either Savannakhet or Ho Chi Minh consulates without showing money in the bank. Unfortunately you can't go into either country at present.