Non-O retirement renew report

My Thai wife and I went to Yasothon (our precinct) immigration to renew my Non-O retirement visa for another year. The immigration officer lady was friendly and helpful. This was my first time for one year renewal without an agent. The office was not crowded, and it still took a few hours. There were a few Thai people, and I also noticed a couple of Thai lady / Farang man couples. We came prepared with my updated bank book, signed and stamped bank statement pages, 4cm x 5cm passport type photos (I asked for 4x6, but shop made 4x5 anyway), photocopies of all my non-blank passport pages, my Yellow house book, and my Pink ID card. NO TM-6 or TM-30. I've never been in Thailand longer than 90 days on any visa, so no TM-47. Officer only wanted one photo. Officer provided TM-7 for us to fill out. We had two small issues. First was bank did not provide guarantee letter about my funds. Officer noted local bank branch, we went there for the proper document and returned with it. Second was one time last year when entering Thailand, the immigration officer stamped me in on 30 day VOA instead of Non-O. Not a problem at the time, when I left a few weeks later the exit immigration officer noted that error, but since it was less than 30 days stamped me out on it, and next time I made sure to be stamped in on my Non-O. But now it was problem, officer said it would take time to resolve, she needed to contact Suvarnabhumi (the entry airport) about it. So we had to wait a while for that. Finally finished, but still needed to add multiple-reentry permit, that took another picture and more forms. Finally finished, I'm good for another year.