small fixes requested