Increase tooltip z-index, add more comments