Updates and tests.
Fixes and extending functionality
Missing add for the timeout interface