Updates from beckdac fork