fixed everthing...