Fixed some fuckery, added some more.