a lot of fixes, new strategy (alarm), doc and test fixes