some refactoring to reflect some recent changes in blast output
merge with remote master