correct oversights pointed out by Alex