added eos and removed pump
timeout support
various fixes
v0.3.3