fixed some non sense