Some Cleanup and fix spell "Cobra Shot"