1) Added constants in __init__.py
2) Some fixes