Buckshot to Hell: Bug Fix

We've noticed and fixed a few bugs. Please let us know if you see any.