Update based on bugs Dan found.