Made some improvements to the blast code