More derps fixed, also started handshaking etc.