Bug Organization

Hi @albert,

Several duplicate/triplicate blocks noted here:

Thanks!
BillG