few fixes
new changes