Fix some outdated comments (mostly by removing a large comment block

that was only causing confusing).  Add free(userpath) and
free(machinepath) statements to prevent some leaks.