many fixes
many fixes