added conversion tracking, fixed activity offset