made it pretty and added the server heart beat back in