Consistency fix in log messages.
Re-work the generator classes to be more generic and allow for easy addition of parameters. Also added the 'do_checks' default argument.