Bug Crushing

Hopefully final...