More cleanup... Implements /smite and /lightning

A few bug fixes too!