Fixed some bug i made