Some fixes to get us a valid response, eventually
Fixed stupid bug with ddesc in the zip mod
Cosmetic & fixed some TODO's