fixed more BUGS... YES BUGS muhahahahahhaaha