Remove debug things and fix up delay on some attacks