updated setup.py
updated init() to use local variables better