Been to the Thai embassy to do a non-O visa this morning. I was pleasantly surprised that things are much better in there, friendly staff and organized. Nice air con room with an electronic number system.
For those going to do non-o marriage visa be sure to.
Register online and complete online form. (This is a must with out it no visa. They fail to mention that in instructions).
Print and take with you the online form.
Make sure you have all documents.
When you go to the embassy you need to go to the security kiosk on claymore road side.
Hope this helps someone.