Christmas Blaster: Optimizations

Minor fixes and minor optimizations.