more examples, fix error mapping