small changes, add analytics