Changed trait self types
typo
Made problem marshaller implicit in terminaters