Completing doi service & misc improvements