Fix new format misses
Fix main class missing setup
Fix typo and new format miss