added marker setup
added some comments
added heartbeat/keepalive methods