More bug spotting and pruning.