fix litle bugs XD