Another round of bug fixing.