less conversion

more saving
save traces on handshake error too