checkign other branch
small fixes