Fixed some bugs lolzor <3