Fixing the armadillo

* Finally fixes the infinite waiting loop.
* Makes the armadillo slightly more dangerous.
Closes #240.