Many small changes to many small bugs.