Fixes in documentation and setup.py