fixing bugs yay