Fixed some bigs