Yay, fixed the rest too