more small modifications for ease of use