Changes to documentation and comments.

Reintepreted the abbreviation "s2png".