Change default behavior to persist when alarmed
Removed adapter factor
Updated some messages