fixed bugs... i think