cleaned up explosive issues