fixed some bugs, i don't even