Modify comments, delete old commented-out variants
Notes on speed tests.