added timing, cleaned up P2P