added names, shark reconnect, fixed timing