Added desktop client support + smaller bugfixes