[master] Clean up to comments
[master] More verbose error msg
[ds4] Better ds4 interface
[ds4] Lots of bug fixes!