bug fixes
merge with salahs change