Fixed some bugs... kind of.