fixes
many fixes