list and embed improvements