yay bugs fixed