Added some wrapping oprions; other improvements.