fixing little issues...