Added av, y, and minor cleanup of au