Add setup.py
Minor fixes.
Minor fixes 2.