more small modifications