few fixes!!!