handshake work, few fixes, mostly backend complete for v2.0.0 release