Better handling of null values
Initial work for specifying custom criteria at the command line run_table
Revert changes to initial_devices