Speed tweaks

Removed sequential search for greater speed.