#169 ztrace updated, trap calls now with return codes