Tons of changes; add more help options.