Blaster initial work + tweaks