initial Segment support
reenable google analytics on test
code improvement