Bugfixes and work on DocularClient implementation