Yay bugs fixed