Clean up, minor bugfix and Chuck Norris save file update.
Fix the undefined value fields for cv generation.