Increased multi-server timeout

Increased multi-server timeout
Fixed some minor typos from refactoring
Added transaction state tracking

Added transaction state tracking