fixing bugs... missed by *various* people who are not the previous commiter!