Clarified transactions. Updated db class and client/server classes.
Merge