-- small fixes made