many fixes
ChangeS