custom marshallers temporarily switched off, fixed dependencies and assorted bugs