remove states from __init__.py, tweaks