storm-control support for lion and lion2. Fix bugs