Some improvements to transactions and the client