fixes for line breaks and nested changes