Added: Some more nvram matches and some refactoring.