Squashin' bugs

Sorry for the headaches!