Fixed some stuff I broke earlier :)