Improve data generation. Add initial support for help.