Various implementations

Fixes for issues #44, #45, #46 + some extra debugging for when our client tests fail next. Watch out on that travis.yml file merge again...