Fix the help; clean up option handling.