fixed bugs... lots left.