Fixed some stuff I broke