some user fixes
few fixes