most parts of leader adding and editing
some minor improvements in fw