few fixes
few fixes