fixed hardcoded pinocchio
small tweaks