small fixes nd improvments