Fix ETA calculation
Don't ignore prime powers