most parts of leader adding
and some small improvments in fw classes
most parts of leader subscription