Fixes to function names, logging etc.
update setup.py