bugs fixed, yay