Accidentally commited some bugs... fixed it.