Lots of small bugs gone. Almost there