fix
few fixes