Re-worked how drums are added

Also PROPERLY fixed fill length anomalies...