some new small fixes