incl several updates