fixes
merge
attempted fix on sqlalchemy