add analytics
online config
adapt to master changes