Writing an agreement for tenancy.

Afternoon all,

I'm in the process of writing my own tenancy agreement and moving away from the estate agents who are letting my property (or just taking £60 a month to ignore the tenants)

I have two questions:

1) their deposit is with the TDS, when they sign with usndoesmthat deposit stay with the TDS or do I have to do something with it?

2) if we wanted to move back in to the property and move the tenants out what time frame do we have to give them? And do we have to specifically wright it in to the agreement?

Many thanks Dan