Fixed goofs, made simpler, and truer