some more small modifications