logging msg
adding fi and a lot of small fixes
fixes