fixed some bugs with the 'Shocker'