SYSTEM_IDENT_MAX -> SYSTEMID_MAX (so it's more consistent with the 'systemid' term)
simplifying some of the command line options and consolidating the data directory