Fixed litle bugs