fix error reporting from c3
+ minor generic fixes