some small fixes
Merge branch 'fw_dev' into Master