fixed setup.py
more analytics blocks