everything fixed (yay)