update ag with recent fixes