more embed features and fixes