custom data on the command line and bug fixes