Rewrote disarmable, and fix the indenting Imogen did