fixed some bugs... part 2