Fixed some bugs... Here and there.