upgrade, rename, and add suggestions from Terho Uotila
add a comment to the patch