Some fixups based on the comments, ATP still