Detection routine bugs fixed, mil combat complete
and the orm
blah