fix some bugs... again. :)