Complete New Lease or add Addendums

[Val J.]

I've been reading a lot on BP lately about leases and I feel the one that my tenant signed 2 years ago is sufficient but weak.  I really want to bone up my leases and be sure that it's air (legally)tight.  After the first year of the signed lease the tenant has been on a M2M.  I want to keep them on a M2M but after reading about some things others have covered in their leases or addendums  I now realize that I need to make some changes.  Help me fellow BPers. 1. Should I begin with a newly drawn up M2M lease or just add an  addendum for the things that I want covered?  2. Where is a good place to start to get an air tight lease.  I've previously used one from online. I'm considering joining local landlord-tenant groups to stay educated on do's and don'ts of land lording in my state. I read that this type of group can also help also with leases.  The lease I would like to have is only for realtors in my state (Texas) Your thoughts?