Debug & cleanup
Tests
Update setup.py