massive updates to XBlaster